Bug fixes, modifications, removed placeholder